Ironing out some bugs..