@ working now for variables. also cleaned up the lines a bit.