- Very strict else checking now working somewhat