Cleaned up existing methods and added up to full scale
Added method bodies through FIFO enabled